Skip to content

Resolve syncing conflicts from repo_sync_working_branch to main#5167

Open
learn-build-service-prod[bot] wants to merge 7 commits into
mainfrom
repo_sync_working_branch
Open

Resolve syncing conflicts from repo_sync_working_branch to main#5167
learn-build-service-prod[bot] wants to merge 7 commits into
mainfrom
repo_sync_working_branch

Conversation

@learn-build-service-prod

Copy link
Copy Markdown
Contributor

Pull request opened by Docs to resolve syncing conflicts from repo_sync_working_branch to main.

MandiOhlinger and others added 7 commits June 25, 2026 16:41
Added approvers for the /configmgr/ folder
Auto Publish – main to live - 2026-06-25 22:30 UTC
Updated guidance for unattended control sessions to emphasize the prohibition of sensitive operations.
* Revise permissions advice for Remote Help app

Updated guidance on app permissions for unattended access to emphasize avoiding screen recording or mirroring apps.

* Fix formatting of important note in deploy.md

---------

Co-authored-by: Laura Newsad <lanewsad@microsoft.com>
Auto Publish – main to live - 2026-06-26 22:30 UTC
Auto Publish – main to live - 2026-06-27 07:30 UTC
@prmerger-automator

Copy link
Copy Markdown
Contributor

@learn-build-service-prod[bot] : Thanks for your contribution! The author(s) and reviewer(s) have been notified to review your proposed change.

1 similar comment
@prmerger-automator

Copy link
Copy Markdown
Contributor

@learn-build-service-prod[bot] : Thanks for your contribution! The author(s) and reviewer(s) have been notified to review your proposed change.

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 9863e2d:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File Status Preview URL Details
❌Error Details

  • [Error: CannotMergeCommit] Cannot merge commit 9863e2da90c4c90f7106d9055a3ba8b9f9645739 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/memdocs into branch main (commit 7472d8284037a3773889a238b2cc4f4bc1487e4d). Please follow this documentation: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ to use git.exe to resolve you content conflicts locally and then push to remote.

For more details, please refer to the build report.

Note: Your PR may contain errors or warnings or suggestions unrelated to the files you changed. This happens when external dependencies like GitHub alias, Microsoft alias, cross repo links are updated. Please use these instructions to resolve them.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants